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

Merge branch 'master' of https://github.com/bitpay/copay into bug/fix-parse-empty-bitpay-account-storage

Browse source
This commit is contained in:
Andy Phillipson 2016-11-16 10:13:36 -05:00
commit 288170fd33
46 changed files with 1049 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/services/configService.js
View file

@ -20,7 +20,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
},
rateApp: {
ios: 'https://itunes.apple.com/app/bitpay-secure-bitcoin-wallet/id1149581638',
ios: 'http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=1149581638&pageNumber=0&sortOrdering=2&type=Purple+Software&mt=8',
android: 'https://play.google.com/store/apps/details?id=com.bitpay.wallet',
wp: ''
},

2
src/js/services/feeService.js
View file

@ -30,7 +30,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
var feeLevelValue = lodash.find(levels, {
level: feeLevel
});
if (!feeLevelValue || !feeLevelValue.feePerKB)
if (!feeLevelValue || feeLevelValue.feePerKB == null)
return cb({
message: 'Could not get dynamic fee for level: ' + feeLevel
});

4
src/js/services/popupService.js
View file

@ -51,12 +51,12 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
var _cordovaConfirm = function(title, message, okText, cancelText, cb) {
var onConfirm = function(buttonIndex) {
if (buttonIndex == 1) return cb(true);
if (buttonIndex == 2) return cb(true);
else return cb(false);
}
okText = okText || gettextCatalog.getString('OK');
cancelText = cancelText || gettextCatalog.getString('Cancel');
navigator.notification.confirm(message, onConfirm, title, [okText, cancelText]);
navigator.notification.confirm(message, onConfirm, title, [cancelText, okText]);
};
var _cordovaPrompt = function(title, message, opts, cb) {